Fix a finalizer issue

svn path=/trunk/; revision=19275

diff --git a/ChangeLog b/ChangeLog
index 20c7f0f3cd2eefa916cc72eb6e8c7e5a37700a06..3a544ea86cdb5b874bd5233fac37a718d8c62ec1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-28  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_finalize): Don't unref
+       accel_group unless it is set.
+
 2007-12-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (get_default_title): Don't return NULL.

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 55aff410ef64df23abe1743aa9baf54fe342d3fd..f8a7e7282c439cc61abc64f6a62e1a28d9cb9023 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -514,7 +514,9 @@ gtk_item_factory_finalize (GObject *object)
 
   ifactory = GTK_ITEM_FACTORY (object);
 
-  g_object_unref (ifactory->accel_group);
+  if (ifactory->accel_group)
+    g_object_unref (ifactory->accel_group);
+
   g_free (ifactory->path);
   g_assert (ifactory->widget == NULL);